Auto merge of #1124 - wesleywiser:vcs_config_option, r=alexcrichton

diff --cc src/bin/new.rs
Simple merge

diff --cc src/cargo/ops/cargo_new.rs
index de3e83ca1c97cbc050f49dd184ba50d50d7b8b28,6291d54be787c51b6ff591e038e9cae35b11b9ea..497bc43f07ee8725fead3d4f51b4a3b3f7221f2e
--- 1/src/cargo/ops/cargo_new.rs
--- 2/src/cargo/ops/cargo_new.rs
+++ b/src/cargo/ops/cargo_new.rs
@@@ -1,7 -1,9 +1,9 @@@
  use std::os;
 -use std::io::{mod, fs, File};
 +use std::io::{self, fs, File};
  use std::io::fs::PathExtensions;
  
+ use rustc_serialize::{Decodable, Decoder};
+ 
  use git2::Config;
  
  use util::{GitRepo, HgRepo, CargoResult, human, ChainError, config, internal};

diff --cc src/cargo/ops/mod.rs
index ae28b4befc2aabe295d2c45c0ba1b181e23f931f,79140527ac104ae6ef050186df89203b2b0eea47..b170a050ff90b59932d3092e2b3174da951e8bca
--- 1/src/cargo/ops/mod.rs
--- 2/src/cargo/ops/mod.rs
+++ b/src/cargo/ops/mod.rs
@@@ -5,9 -5,8 +5,9 @@@ pub use self::cargo_rustc::{compile_tar
  pub use self::cargo_rustc::{Context, LayoutProxy};
  pub use self::cargo_rustc::Platform;
  pub use self::cargo_rustc::{BuildOutput, BuildConfig, TargetConfig};
 +pub use self::cargo_rustc::{CommandType, CommandPrototype, ExecEngine, ProcessEngine};
  pub use self::cargo_run::run;
- pub use self::cargo_new::{new, NewOptions};
+ pub use self::cargo_new::{new, NewOptions, VersionControl};
  pub use self::cargo_doc::{doc, DocOptions};
  pub use self::cargo_generate_lockfile::{generate_lockfile};
  pub use self::cargo_generate_lockfile::{update_lockfile};